Merge changes from emacs-23
authorChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:46:45 +0000 (14:46 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 1 Oct 2011 18:46:45 +0000 (14:46 -0400)
commitfbc09d981cf0cbd6f322b4761cac335e95e87fa9
tree0f57e856b2bb81541c8bb866defb11eef6db2f05
parent9d2c9984d94ff22382959acc12c55b29eca33306
parent1aed9c0d13f9e2551c841b79731e7b2fb781298f
Merge changes from emacs-23
src/ChangeLog
src/keymap.c